projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4684aa7
)
mx6ull: Fix WDOG3 base address
author
Fabio Estevam
<
[email protected]
>
Thu, 23 Nov 2017 11:18:53 +0000
(09:18 -0200)
committer
Stefano Babic
<
[email protected]
>
Mon, 27 Nov 2017 09:34:31 +0000
(10:34 +0100)
i.MX6ULL has the same WDOG3 base address as i.MX6UL, so take this
into account in the base address definition.
Signed-off-by: Fabio Estevam <
[email protected]
>
Reviewed-by: Peng Fan <
[email protected]
>
Reviewed-by: Stefano Babic <
[email protected]
>
arch/arm/include/asm/arch-mx6/imx-regs.h
patch
|
blob
|
history
diff --git
a/arch/arm/include/asm/arch-mx6/imx-regs.h
b/arch/arm/include/asm/arch-mx6/imx-regs.h
index 624ccecfd60383b5f29a18dcc7f158720f857c12..7736b6a8ac0452d110393242ec42b6a2de36ea0d 100644
(file)
--- a/
arch/arm/include/asm/arch-mx6/imx-regs.h
+++ b/
arch/arm/include/asm/arch-mx6/imx-regs.h
@@
-367,7
+367,7
@@
#include <asm/types.h>
/* only for i.MX6SX/UL */
-#define WDOG3_BASE_ADDR ((
is_mx6ul() ?
\
+#define WDOG3_BASE_ADDR ((
(is_mx6ul() || is_mx6ull()) ?
\
MX6UL_WDOG3_BASE_ADDR : MX6SX_WDOG3_BASE_ADDR))
#define LCDIF1_BASE_ADDR ((is_cpu_type(MXC_CPU_MX6SLL)) ? \
MX6SLL_LCDIF_BASE_ADDR : \